From bcd125ec314e7059ea2bf71ce10f83eda6529927 Mon Sep 17 00:00:00 2001 From: "mafetter@fleming.research" Date: Tue, 12 Apr 2005 10:16:00 +0000 Subject: [PATCH] bitkeeper revision 1.1289 (425b9fe0JVvbTzMQDh4T-vsRodcmaw) cleanup after merge --- .../arch/xen/configs/xen0_defconfig_x86_32 | 1 + .../arch/xen/configs/xenU_defconfig_x86_32 | 2 +- xen/include/asm-x86/shadow.h | 11 +---------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 index 0dd968ee5d..654e61e219 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 @@ -20,6 +20,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set # CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SHADOW_MODE is not set CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_X86=y # CONFIG_XEN_X86_64 is not set diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 index 276f0ad1cd..f3037e68a0 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 +++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 @@ -17,7 +17,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y CONFIG_XEN_NETDEV_FRONTEND=y # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set # CONFIG_XEN_BLKDEV_TAP is not set -CONFIG_XEN_SHADOW_MODE=y +# CONFIG_XEN_SHADOW_MODE is not set CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_X86=y # CONFIG_XEN_X86_64 is not set diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 61a3b5c9b4..97c40072fe 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -398,13 +398,13 @@ static inline void shadow_drop_references( page->count_info, page->u.inuse.type_info); } +/* XXX Needs more thought. Neither pretty nor fast: a place holder. */ static inline void shadow_sync_and_drop_references( struct domain *d, struct pfn_info *page) { if ( likely(!shadow_mode_enabled(d)) ) return; - /* XXX Needs more thought. Neither pretty nor fast: a place holder. */ shadow_lock(d); if ( page_out_of_sync(page) ) @@ -412,15 +412,6 @@ static inline void shadow_sync_and_drop_references( shadow_remove_all_access(d, page_to_pfn(page)); - if ( page->count_info != 1 ) - { - printk("free_dom_mem in shadow mode didn't release page " - "mfn=%p c=%p\n", page_to_pfn(page), page->count_info); - shadow_unlock(d); - audit_domain(d); - BUG(); - } - shadow_unlock(d); } -- 2.30.2